Never ending using cleanup
Merge pull request #333 from peternewman/trivial-fixes

Never ending using cleanup. GCC passed on second run, merging.