libslcxx: Fixed some more code + comment for later removal