I'll merge anyway - I want all this in there fixing up my PR - but I'd like to know the motivation for this change