All now using new method

This function seems a lot smarter. Just cleaning up the way each
shortcode is added.