reducing whitespace and duplication, and removing dead variants

First patch reduces the whitespace in the basic US variant.

Second patch replaces a duplication with an 'include'.

Third patch drops four dead Sun variants that no longer work.

Fourth patch improves a comment and reduces whitespace.