Add Epoch newtype; address review comments