zframe cleanups

This was originally posted to https://reviews.imfreedom.org/r/267 but due to
some issues with reviewboard this is being committed and posted by grim.

Testing Done:
per 267, just a compile.

Reviewed at https://reviews.imfreedom.org/r/291/