Fix minor regression in flag assignment marshalling to custom-setup