dfix: Ran dfix to update to more modern declarations