Move some more vars inline

Created by: edg2s

Merge request reports

Loading