Change implementation of Common.options to match wiki version.