added replacing Opt features and possible variable identifiers inside conditions of IfStatements and ElifStatements
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup