More work on name clash checking.