Improved the readability of the metaclass capabilties stuff (still not 100% happy).