More rewrites to make lesser use of getMessage()