Turn zero_or_one and friends into properties