Attempt something 900 at Fixing up Orca Tools.