GitLab

Various minor tweaks to convert asserts into error returns and to
improve error checking on intermediate surfaces.