Improve treatment of instance variables