Cleanup: Use qualified names in macro for ease of use outside main library.