Clean up class extensions

Now that we can require GCC >= 4.6, we no longer need to fall back to
using a category on old compilers.