[master] Friday's bit of refactoring