Thanks for the comments! I believe I've addressed them in the updated patch.

@JeffBezanson - I'm not entirely sure I understood your comment.  I've broken the functionality out into a separate function, but I don't know how to remove the `@eval` macro.