Options-file is now only read if needed.