[Don't merge] add onlyif and unless to state internal keywords

@thatch can you check this.

I think it is simple enough.  And cuts out most of the fluff.

Thanks