As you have it is fine for now - I agree it's convoluted.  After this is merged I may issue a new PR with instructions about this as a note or something.