Simpler fuel system changes. Slightly more code duplication than my earlier solution but simpler overall.