First attempt to try to remove some of the deopt-ing interface.