Wrap the whole bishop function, arrgh macros don't compose.
Bump version.