Attached is a revised patch that I believe is more readable but is
logically equivalent.