Overall: migrate to proper JS usage everywhere.