get rid of NonNullStringMatch
Merge branch '21-misc-cleanup' into 23-more-gc-mods