This PR has the following changes: - Use switch instead of if - Remove unnecessary (un)boxing

Comment From: philwebb

Thanks very much @asashour