Inline and remove vega_scale_xxx functions