[Poshuku] Slightly better code.
[Poshuku] Delayed model population, probably fixes #1786.