Added pre-defined "plain" macro; fixed checking for macro directories