Simplify literal int stuff
Improve heterogenous ** for Long