Fix bug introduced by FileSet code and improve REPL
Change boolean conversion functions to non-exported