Automatic merge from submit-queue

Convert internal types to use exact precision integers

This makes conversion more suitable for future optimizations, and we need to stop pretending for some of our internal types that the width of the int doesn't matter.

@wojtek-t