Minor enhancements or PerComment grammar. refs #442