Lock down non-public API. #15