now typechecking the original source ast when there are ifdeftoif replacement parts loaded

fixed mixed feature implementation bug

added simplifying conditional nodes to replaceOptAndId (fixes bugs when there were multiple nested conditional choice nodes)