Re #414: Fix references to old current_status sub-query.