dev/builds: Tidy up of "show" option variables