Fix nits from JoshE.