Normalize source-block types, fixes #345.