Resurrecting more tasty Lamothe fixes.