A selection of small cleanups
Merge pull request #52 from w3c/jgraham/small_cleanups

A selection of small cleanups; r=Ms2ger