Refine declarations to be consistent