migrate: Adjust var declarations