Compiler cleanup after v3.9-0 merge
30 files changed