Even more parameterization and cleanup
Merge pull request #1893 from tambry/MoreParameterization

Even more parameterization and cleanup!