Review fixes, 1 more pass to go.