Improved retail-ness of recent NM additions.

@xdemolish I think I got those problems we were discussing all sorted now. Also it turns out I can leave the old effect in place rather than set mods in the SQL thanks to you setting it up to override the amounts. <3 I think it winds up being more accurate this way anyway because of certain situations where an otherwise non dispensable effect can be stolen/copied, but I'm not 100% positive of that.