Reduce set -x output a bit
Add architecture selection support