Comment 12 for bug 1170086

You are right I think. I think good names for the sections are return_on_dismantle (you could drop the _ for symmetry with the other names, but I think they add readability) and return_on_dismantle_on_enhanced. I see no pain in making these long and explicit - we will not write them often and tab completion is your friend.