Cool.

But just for consistency, you missed a trick (or two) with #336. Tsk, tsk, tsk ... your standards are slipping @esc24.