Fix issue 12 where we try to smart detect if the condition contain define or not.
Add one more check to the positioning I forgot to git add in previous commit.
Fix typo introduced in previous commit.