Improve ConditionalDeclaration