Simplify code. No functional change intended.