No more redundant checks. Additional test.