Add some trivial but helpful scan shorteners.
Support disconnecting graph edges too.
Fix 1 import/line rewrite.