Expand digits/numbers in code...
Get a few more common code constructs generating...
Comment out the string-pass-through as it doesn't do anything useful

Need to have a way to have the "generic" context take over...