Bug fix in exhaustive max-marginalizer, and max product spec