Complete implementation with some unhandled issues.

I did not consider when a method with a unitfor annotation on some
parameter is called with a null argument for that parameter. This
causes exceptions. Fixing…..