WIP: add source contexts, remove debugger-only macros