Fix macro bug.
Merge pull request #419 from AndrejMitrovic/FixupDocs

Trivial: Fix macro bug.
Add missing typeof.
Merge pull request #420 from Garciat/patch-1

Add missing typeof.