A small amount of tidying, plus an upgrade to the latest trireme snapshot in order for npm to work.