A bit more extension hacking.