Simplified submodel decorators by using decorated method names

This is my proposed simplification to the new submodel machinery. Now, only the ``matchconditions`` decorator requires and argument making the remaining decorators simpler to use.

For now, I have preserved all the original names, partially to help show how things have changes and partially because I do not know what conventions we wish to follow. Suggestions welcome!