Do some cleanup in user.
Update user to use new output efun.
Update lots of the commands to use output efun.