More explicit messages in definitions

Second try.