Refactor message_should_include to fix overlapping errors