Also, do some cleanup, like declaring Params instances.