More work on macro library.