Some fixes for refactoring support around function parameters
variables.