[NH] Minor cleanup and add in schema as an explicit dependency.

Some minor cleanup (maybe) and deleting of dead code. I also added schema as an explicit dependency and use it to check if an argument is required or not. There will need to be tighter integration as well since we check for map? in at least one other place where it's not completely correct.