Fix baseAssign code style to match lib