Adds Zed's debug macros into the whole thing.

Signed-off-by: Noufal Ibrahim <noufal@nibrahim.net.in>
Cleans up calling code.

Signed-off-by: Noufal Ibrahim <noufal@nibrahim.net.in>