More consistent internal implementation.