This was already true in most places but not 100%, leading to lots of redundant checks and conversions.