At the cost of some duplication, remove requirement for extglob. I love languages which have bits that can be turned off for you.
Merge bug25355 into stable.