In case anyone has stared at this code, but I'll file an issue shortly