CLC-1050 followups

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1050

Followups from previous pull request (#534) and a filling-out of the translation table.