*Branch is broken* handle with care.

I'm in the middle of rewriting the implicit macros to one logic macro.