Not cloning the null elem - probably quicker to make it again
Caching values in 'for' by PK, not by value
[samples] Updating deps etc