Get rid of the last two Gestalt calls.