Fix some macros and remove the context (do it in a subclass if you want).