Use the macros
Use the new macros
Remove obsolete code
Make sure to advance on the source too