Reduce cosmetic differences between instances

recover for StateT is actually different, so it's good if it looks
different.
Drop unused binding