Restore newline and fp-call counting