[PATCH] Fix minor fallout from operand_address changes