tidy messup
Fixed bizzare expandafter/noexpand/the situation
Added test case for expandafter/noexpand/the situation