Cleaned up Ameche dependencies.