fixup! Adress more #1988 (Acid 2) review comments.