Remove useless indirection on change