Nice catch! I was able to get rid of the isUpgrade flag everywhere. It was an interim approach that wasn't ultimately needed (obviously).