Change parameter singleton objects to vals

As requested by @tackley. Mainly to work around a type-checking bug in our IDEs.