assemble: use opx and opy in a few more places