Collapsed conditions to a base type

They are all the same anyway. This meant a slight tweak for the dogDemo
file.