#373 nested property error and improvements

- fixes #373 
- flattens / simplifies generated method (no longer building nested if statements)
- removes superfluous null check in case there's only a parameter to be mapped (no properties).