Incorporate DaveP's feedback for C-c / t