Not sure where I missed that, I'll dig more. Not sure I totally get it but I'm less familiar with the code than you. 

"After a bunch of refactoring" <—— I guess I always consider factoring first and merging second rather than the other way around.