More geometry only changes. Working towards #125.