Cleanups to computer.cpp suggested by bug_sniper.