Fix build failure due to CatchOutput changes.