Songcast: Some more refactoring whilst I thought of it.