Yet more using cleanup
Merge pull request #326 from peternewman/trivial-fixes

Yet more using cleanup