Add better support for -Mandel=<arguments>