Cleaned up binary generation.