Simplify & microoptimize code. No intended functionality change.