Tweaks to prepare for Reef, and finish up CLI modification features.