flymake from upstream