Added `until` macro and fixed `unless` macro (comma operator)