Make NiGHTS super consistent with regular super (Closes #520 for real this time) Closes #520 See merge request !1666