Be consistent with how we do this elsewhereh
Merge pull request #741 from alex/consistency

Be consistent with how we do this elsewhere