Burp some code for the broker class

I really hope this new style of writing classes will still make sense
tomorrow.