nicferrier fixes for the refactor, make sure we're not leaking work buffers.

Users who have contributed to this file

• nicferrier
• invalid-email-address