Simplify code. No intended functionality change.