Core/messages: Hacky fix for NAMES / CUT.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit e604c5532277d0ab314818be46ac548f638fffb6)
(cherry picked from commit d2f3065c74afe46d8285844422f760b799719051)