yeah, I must admit my function body looks pretty retarded!  I was blindly adding to a bunch of ancient state test functions that were made redundant some time ago by a single ```is_currently( state )``` function - which does do it your way :-)   Anyhow, I'll remove the lot now.