Cleanup old bottle syntax.

Seems like we can justify this by now.