Merge pull request #334 from exarkun/misc-simple-extras-with-optionals

Misc simple extras with optionals