Why is this separate? It seems like an artifact from how things were rather than anything to do with the current direction of the code. Did I miss something?