Tuning stuff to have less redundant state set in hopes of finding source of analyzer logical buffer store warnings, but still haven't resolved that.