Some minor application of DRY. 

Some or all of these may be of interest. Tests pass and there should be no change of behaviour. Thoughts?