Removing indirections