Minor cleanups from James' suggestiongs