Swap extend arguments to allow assignment

Fix problem with extend options being overwritten by defaults.