closes #249; simplify natural joins