Removing useless conditional from switch
Cleaning up complexity in method generator (excessive conditionals)
Cleanups in the parameter generator (further removal of conditionals)