Chg: Dev: Replace is_router with is_router() etc for GH-192