Switch things to newtypes

The bug I thought was blocking this wasn't actually.