Further refinements and a code fix.
bench: 9272431