Issue #1032380 by Jerome F: Allow various class identifiers to handle spaces properly so there can be multiple classes.