Cleanup and consistency changes.