Move #ifdef wrapper.  The child state is always updated