Fix 460

If you're switching to an instance variable (which makes sense) I'd also change those methods to work on the variable directly. That will make the code mode symmetric and natural.