HOPKINS: Get rid of a goto in the display code. Remove useless casts (with comments about that). Some renaming.