First pass over N4071, adjusting our implementation to conform to newest specification