Add early AST normalization stage
Fix some warning tests after changing message collection