Add hyphen when modifying a noun (it's a compound adjective), and
remove hyphen when following a noun.

Bug 10841