Take 4: Code cleanup. No functional change.