The additional height and setback regulations set forth in Section 23-436 shall apply, except as follows:

1. for the purposes of applying such provisions, references to the street wall location provisions of Section 23-431 shall be superseded by those of Section 123-651 and base heights by the provisions of Section 123-652; and 
2. for the purposes of applying the street wall modifications on corner lots, where a zoning lot is bounded by only one street line along a street frontage where a Commercial District or Special Mixed Use District is mapped along the entire block frontage, the street wall shall be applied along such frontage.