Enhancing contribution counting support for conditions, #31