* Re-arrange buffer/base64 inclusion inclusioning.
* Pull in bouncycastle to make life less miserable.