extract-variable is working now.
Cleanup refactoring on extract implementations.