Better (or actually proper) handling of absent width/height