Fixes for #3441.

You can put crayons back in their box.
The same with snappops.