Refactor stuff and improve interpreter feedback.