Add master NLP applies.
Move more valid_ stuff out of master.