'other' is a more reasonable default for server type than 'cyrus'.

The warning at the bottom is obsolete if we just don't go back to literal
mode. Why are we going back to literal mode anyway? There should never
be any text in these files, just PHP code.