Make reference use consistent