Yep, that first one will do it! And you probably want to rip out the polygon merging code and minimum zoom on the attrs. You can use --only-layers= or --exclude-layers= if you don't want all the others.