(Frontend.c) Some more cleanups