Cleanups and more parameters.
More symbols.