Making some minor improvements to r199626.