Minor tweaks. No functional changes.