I'd be interested to see if David's suggestions here are going to work enough to get by. Please let us know.
In the long term we will have to fix the exceptions in mod to make them consistent with all the other plugin types, see MDL-33783, but it has to be done carefully as it means ALL current 3rd-party activity modules need to be updated to use the correct frankenstyle.