Also, the "strip colons" change - can we add a test for that (or do it in a separate PR)?