back out comma patch and tidy up indentation
add tests that demonstrate problems with dynamic typing