Simplified rank-related methods a bit