Make utlity methods more consistent.