Fix unquoted atoms for R16 compatibility