Fix embedding of constant ints

Allow 64-bit constants.  not sure how we didn't run into this before
Merge branch 'master' into invoke
wip