Minor cleanup in prep for i386 port