prepareASTforIfdef now also fixes choice node features