Improved instance interfaces and a command-line flag to show built-in instances

Fixed in d0fb3ea7d4e6e6de313e6dcdb2ba179ceda95f58.