WP-3471: Rearrange Book fields.