Merge "(refs #7214) Treat $ exactly like function application"