Make 'x' option behave as advertised (bug #1878)