Return a complete pathname.

For or internal Basic, keep the existing semantics, that for some
reason returns just the filename.

Change-Id: I897cc797ca2158ca7c798f3e8adcdfa57a41ee3b