couple fixes to make sure out-of-context nodes get all the states they need, and...