Fix block macro, ignore optional newline