Changed as-disjoint-subclass implementation to use as-subclass.
Also some white space fixes.