In the name of pragmatism I'd like to see this change committed (with the fixes I've mentioned) and I'll add specific issues for the points above.