(In which case I'm inclined to leave this patch as-is for now, and submit a follow-up PR with the larger cleanup effort.)