Merge pull request #336 from peternewman/trivial-fixes

Yet more using cleanup