Cleaned up dependencies per Jeff's patch.