I think it's OK to put my little optimization notes in the backburner. Once we verify this as correct and are happy with the test coverage, we can try to squeeze the extra cycles in a different PR.