I know this is not part of the PR but it jumped to my attention, and you cleaned up verbosity elsewhere too.