Function names withing dynamic expansion (fixes #2)