Bringing back the positioning of references and values that were messed up with in the recent refactoring.