vfp: Actually make the code somewhat readable

Should be much less like ifdef soup and more like readable code.

Requesting tests to make sure everything is as is before (seems fine on my Mac).