Clean up usage of variables in Chef template