lang()-related fixes.
Cleaned up AttributeMenuTool tool-skipping hack.

Change-Id: Ifb3eae8c404920a821373b2030a3071f8693cbe8