Fix NPE in ConstructorCallsOverridable and XPath error in AvoidLiteralsInIfCondition