Match recent go-roomba code-move changes.