Fixed generation of content variables.