Agreed.   I'd like to refactor to reduce repetition, so I'll work this change into that process.