I found this youtube showing the removal of the whole headlight assembly, which is pretty cool!
https://www.youtube.com/watch?v=D65x8G1f6AI
But I am still unclear about how to replace the corner section. Once the assembly is out, does that piece just unclip?