Let's stop assuming options is always passed in...