Render refactor (with couple of fixes)

This isn't needed, the `Matrix` constructor does the same.