Yet more expansion of build target options