Tidying up signup factory code.