Improve the action and throw-label names.