Address comment nits.