Options refactor

Bring find_by_key into line with find as far as context and options are concerned.