Tweaking further (including no longer do Null inferencing; Eclipse's
reasoner is too buggy for it to be worthwhile)