Merge "Factor out option variables from int to bool types"