we actually would like to move away from this, so any ideas how to make this more explicit and less magic are appreciated