condition:returnFilter clarify docs, code cleanup.

Clarification on the javadoc for the 'returnFilter' field of the
'condition' bundle filter. Also a little cleanup on the implementation
simplify some repetative logic.