more of the code using more realistic pyrax APIs

Change-Id: I6d9295af3104a5a76b40494488fa793b8ec431fb