accountsservice: more type fixes