Relax trollop constraint to be compatible with a wider range of clients. Reformat some opts