Merge improvement.
Add `expand' action for `javaimport/class' source.
Trivial bug fix on scope.