Remove some poor idioms for 1.0
Merge pull request #709 from trek/1.0-idioms

Remove some poor idioms for 1.0