Preparatory refactorization for new instructions

Die 's' zit erin.