Minor cleanups for code review with Ned