I think that's valid; plenty will feel corrected by it. The danger is setting it up as this cure-all, when it isn't.

The definitions are definitely more complicated than the traditional usage of them. Not sure what the answer/arrangement is, but of that much I'm sure.