Stopped using buffer locals for infinote state