Looks like we can remove the switch and use a simple if now.