Good point! We should listen more carefully to our refactoring guru.