Add back deprecated functions in macro form