More progress on booleans. #25