Minor cleanups based on Eugeny's PR feedback