Fix duplicate header guard + minor maintenance.