Expose block factory for NonFatal mapper.

Refactored names of some of the longer NonFatal and Optional Mapper constructors.

Closes #6.