Makes some invariant methods static
Rewrites invariants. Still a problem with finding the ancestor