#1261: Everything appears to work. Now to test on prod data.