Moved all potentially optional arguments into context methods.