improve support for "if an_identifier:" conditions