Change @options ivar calls to methods