Got rid of some more realpath()s introduced in 1.5