Remove #56 workarounds, add second, ffirst, nfirst, fnext