Build fix and hide away some minor implementation details.