Default expand_lists to True and set it to False for only_if

Fixes #2026 and #2027.