A lamp (12) having a front surface (222) from which light is emitted and that includes a high efficiency light source assembly (212) producing a beam having a 3 dB beamwidth of greater than 100°, and which includes a substrate, a high efficiency light source supported by the substrate; and a dome-lens (214) that contains the high efficiency light source. Also, an optical assembly is positioned to receive light from the high efficiency light source assembly (212) and to produce a headlamp light beam emitted from the front surface (222) of the lamp (12). Further, an annular light block (220) defines an annulus and is placed about the lens (214), so that the lens (214) protrudes through the light block (220), thereby creating a chrisp boundary for the output light beam.