Account for primitive wrapper classes using Apache commons
Less magic characters