/* If the buffer has overlays, text properties,
or multibyte characters, use a more general algorithm. */
if (buffer_get_intervals (current_buffer)
- || current_buffer->overlays_before
- || current_buffer->overlays_after
+ || buffer_has_overlays ()
|| Z != Z_BYTE)
return current_column_1 ();