Core/messages: Hacky fix for NAMES / CUT.

Signed-off-by: Martin Stone <martin@d7415.co.uk>