Simplify right-* messages

Change-Id: I0d9e509560ad9c9d26b5dfef05fa96e7d804eca0