Bug fixes for Darwin test generation.