Why deal w/ pointers when you don't have to?
Adapts change from 867f6de5 throughout framework.