[eval2] Make the package declaration for non-SBCL platforms more accurate.
[eval2] Fix refactoring bugs.