Improved working with constants in conditions (thx to mbohuslavek)