Remove some duplication in favor of new convenience method