Minimal fix to work around older stdlibs