>> The height of the initial window goes down from 35 lines (630 pixels)
>> to 33 lines (595 pixels).

This patch (added on top of the previous one) should fix the frame 
size calculation.

Still looking into whether there's a purely truncating solution.