Ongoing refactoring and cleanup as an independent software package.