- Use OPTIONS helpers (note: no support yet for SUB_FILES) - Sort OPTIONS section Approved by: koobs (with python@ hat)