Changed remaining valueOf methods to just of