Ah, yeah...more than a couple general form issues came to light when working on this bug. I'll put the labels in with this PR and leave the rest of the issues to bug 859427.