Remove premature optimization of params

Previously subselected paramaters for the phi_*()'s,
in order to reduce the search space.
This was premature optimization, and therefore evil.

Removing this should result in easier to refactor code.

The various phi_*()'s now do the subselection locally,
which is much better encapsulation.