Minor refactoring of user-facing APIs