Merge pull request #1605 from rubenk/tail-mark-variables-as-static