Small cleanups to nextract