Few tiny fixes for scope_guard.hxx and state.hxx