follow-up to r106754 - using strict comparison, adding logic for editing existing...