Extract form objects from the persistence objects

OK.  Perhaps fodder for a future PR, then. No big.