Use catf() over messagef() where appropriate

Use catf() over messagef() where appropriate #587