OK, you're right. This doesn't need any more changes apart from the test and the comments explaining the "_slash_" oddity.