I built the two pieces separately - I thought there was a good chance the template would be accepted but the controller change would not.  I'm honestly considering recanting the controller change, submitting the template rewrite by itself, and then coming back with a better-written and -tested controller change another day.

Thanks for the quick notes @jdutil!