Finally merge in @kpfleming's suggestions in #1430