Merge "tighten up some neverallow rules."