Convert use of old basename formalism to filepath_stem