Minor simplification and clarification of previous commit