Fix more antipatterns