Refactored: another take on gf and <C-w>gf