OMakefile cleanup.