Simplification: remove unneeded 'variables' handling

since the strings are generated dynamically anyway...