Improved handling of model formulae

Previously format was returning vectors of length > 1, so had to
collapse