Init code clean-up; added interp.*