Added tests and code for recursive Option equality constraints.