Make breaking changes to simplify the interface.