Typo
Minor rename
Minor rename
Minor refactoring around macroexpansion of functions