- Fixed strict-convs before Stores again: We can skip at least those