Fix some int casts/conversions
Cleanup
Cleanup, rename TypedBoxedValue