rm user.h; make consintr generic, not tahoe-specific; new calling convention