some variable resolve enhancements for REPL