Stripped out the VXR-specific pieces, and removed some undecided
elements, so we may start from a simple starting point.