java. Cleaned up message builder system.