Better handling of booleans.