Wrap and sort field lists

This will make it easier to manage them as things change, which we
expect to happen quite often.