Add support for socionics quadras.
Minor cleanup/consistency.