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