More minor interface changes for consistency.