As well as minor switch table reorganisation, attempted to implement call 35.