Merging itemlist improvements in prep for publication.

/cc @vholland