Fix copypasted names
Remove unused switches
Fix multiarch handling
Revert "Remove unused switches"

This reverts commit ecb1c72c3a04b7bc89ae00728f4d7b384ca12221.