This is a set of maintainability changes I've collected while trying to solve a problem with music iterators.
