[WIP] Hash/Block mixins

See #1222.