Yes -- that method is really for internal use only.  We need to use `Commands.FILE_CLOSE` for this like the other code in this file (this should work _exactly_ the same as clicking the "X" icon, as I said in the bug... hence it should use the same code).