Switching to more built-in marshaling of Criteria