Eliminate unnecessary use of #perform: and some shadowing.