More tolerant flexing for variables + better beautifier for generated sources.