Minor cleanup in schreyer.lib / testing routines