Use current_state instead of current_state_str for comparison to avoid h...

...aving to deal with host vs service status codes.