New make targets, clean up resolve.c