Adjust to recent pericmd-base