Refactors w/ explicit object contexts