Finish forward porting s_user.c changes.