Previously we would use '*_term_parameters', as returned by
'_make_*_terms', however this was polluted with Exceptions.
Instead we modify '_make_*_terms' so that it does not return this
confusing object and use 'terms' directly, which are guaranteed
to either have a valid set of 'parameters' or 'None'.