Agreed it's ugly, this is old code. I was going to stick to just moving whole methods around, leaving their bodies as-is.