Resolve review comments.
Recovering from botched squash.
Squash is coming soon...