Doesn't break i386 and might be better for sparc64.
with a version based on puffs. User functionality remains the same. (missed new file in change batch)