Minor cleanup re PR feedback