A bit of TODO: cleanup; also remove rvr/forms/old. I really don't think
they're needed anymore.