Inline method so we don't merge and unpack options twice
Remove default value from bottle_suffix parameter

We always call this method with an argument, so we can simplify it.
Remove default value from bottle_url options parameter

To construct a URL, we need options to pass to bottle_filename, so this
method should error out if none are given.