Fix for two issues: Superfluous minimal complete definition for classes with single parameters, and fix for #281

The extra commit by @sol seems to be upstream, but not in your repository yet.