Assorted fixups
These commits would have been MR review comments if I were not MIA for a month
This also restores code that's going to be used for the FileChooser implementation.
These commits would have been MR review comments if I were not MIA for a month
This also restores code that's going to be used for the FileChooser implementation.