This resolves a lot of NLL issues, however full NLL will be necessary to handle a couple of remaining issues.