I'd like to do the same for console and node; didn't want to make this commit too wide-ranging. Console and node don't load broker code anyway...