Converted to fixed sized arithmetic types in most places.