cli: Misc. cleanup to kick off a pair progging session!