Remove more deadweight.  Fix broken references
State2 -> Attempt new syntax.  Not overly happy with it.