Tidy up overlay declarations