Fix clean/squeaky-clean targets

More brace expansion problems

Other minor tweaks