state: use strictLocalID in more places where appropriate