Add collapse-into-one-line and complete-function macros