A few minor tidy-ups on the instructors' portion