Bump feature-switching to 0.10

This has also reordered stuff in every file known to man, for some reason.