More minor cleanup.
Merge remote-tracking branch 'dan/master'
More minor cleanup