[IZPACK-1194] "contains" condition does not work for checking plain <variable> values (post-fix)

This change is just a post-fix with clean-up, no functional bug, just code involved twice after the implementation originally introduced in https://github.com/izpack/izpack/pull/293.