I believe #53 would make this nicer.