Make sure that tokenExpiry will only work for subusers. Some minor related cleanup.