Uglyhack --

Extension is still a ugly hack for overriding category, but less ugly
now. A little bit less.