Ah, yes, I was lazily one-lining it.  Will rebase and fix.