Make non-macro entity functions swappable with the macro versions