This needs to use `environment.caller` instead after #821 lands.