directive-handling fixups