Finish minor cleanup from change f421b69f308bdff96928ff6c359a80353b539f0...

This just finishes the minor cleanup Jinmei put in issue 9.