Merged in terminfo-keyname-printer from simplfy branch.