@scopatz  These guards should be updated to the new shorter style. Then I think this is ready to merge.