Refs #7423: Cleaning up less compilation.