A few more tweaks to the parser
Prevent the sample string generator from overflowing the stack