Thanks @epriestley for knocking this out so quickly! I have one small request -- if you don't want to address it in this diff, I can file a task.