Fix union of class type and instance factory, and bash completion without tput

Fix union of class type and instance factory, and bash completion without tput #853