Fix unquoted map + normal sourceComments