Add support to the macro-parsing functions for keyword arguments