Inline the logic for the first_bottles_clause

Eliminates the need for a couple of separate methods