Final tweaks to get master with editplot merge tied up.