Further improve error messages for confused decorators