Use 'formatted-message' instead of '&message' where appropriate.