Fix DateTime.Parse error in parser
Assorted cleanup
Add and handle complex DSL case.