More cassowary cleanup.