FIXED: Make sure autoloading preserves the notion of current procedure.