I don't know how topical this is anymore. I removed, repaired and replace the right headlight this afternoon. Very easy:
2 bolts in the engine compartment; 1 bolt easily accessible with a long extension up behind the bumper; 1 bolt in the wheel well behind the plastic liner.
2 bolts in the engine compartment; 1 bolt easily accessible with a long extension up behind the bumper; 1 bolt in the wheel well behind the plastic liner.