In passing, fix a bug in the previous commit where left-over code would cancel the whole new parsing code for advanced source fields options.