Code simplifications and cleanup
Additional date parsing and better StackLookahead mark/restore