Fix conditonal packages parsing at least for most cases.