Message suffix needs to be checked once only, minor refactorings