Simplify/fix the option assignment kernels slightly