Improve mkgibbontest -s somewhat.