expand_path should be called on prefix
Don't expand target
Save the results for popular for no-args functions
Remove unused method