REL-1596: Added new combinations as requested.

If somebody has a moment to quickly review the NIRI code, that would be great.
I'd probably reverse the equals here to avoid a NPE, just to be on the safe side. Something like AlatirParams.Mode.LGS_P1.equals(_oe.blah blah blah).