Use match rather than if/else if

Just a small style thing.

The constants defined in status.rs have also caught my attention. I'd have to look more closely at exactly how they are used to be sure, but it looks to me like they could be replaced by some kind of enum.