[WIP/TEMP] Concat fnames rework

This is to support #1097, so @splinterofchaos can tell me where I'm reasoning wrong, and travis can tell me which test is failing.
I just put it there as a quick (read: lazy) fix.