Add naive $*SPEC.extension for basenames
Properly use basename/extension