more fixes/cleanups to langshootout code