Merge the working byte code gen for basic math