Fix the arbitrary declarations.