So in the end, I'm going to use your first suggestion since it's the simplest.  Just committed it.  I also check if the hostgroup was changed too.