Change pass functionality to trimming declarations. Need a separate pass for replacing local variables.