Please use "auto" in all places you remove "static", so it's always clear that in no case should there be a global definition. Please test on vanilla 3.3.x as well, and 3.2.x if it's not too much trouble.