However I've pushed a change onto this branch that makes this more principled.