Fixed bad constant folding of mod op
Use safer function to get uid
Fixing inlining bugs.
V0.3.7