modify emit_if / emit_vector_if such that they take the condition_mapper as an...

modify emit_if / emit_vector_if such that they take the condition_mapper as an arguement, rather than the condition_str itself -- additionally, modify the condition_mappers such that they it can take an optional parameter that is the current inner AST to be wrapped in an if-statement