Last question, then you can pull either as is or after change + green.

Can/should that assert be pulled up a layer or two, dropping the conditional from the if at line 418 knowing it can never be null there.