Shorter way to solve message_expand() in LimitsOld.pm and fix on small incoherence in the same method