- Various cleanups and refactorings.