I should say... the re-tag approach is the theoretic proper procedure. I have in the past been been more pragmatic about this. Maybe I'll switch this back up again.