Fixed bug in primary expression parsing
Another conditional declaration fix