Add `collapse' macro
Rename tipBegin/End macro (into begin/end_tip)