Fixed by additional commit. Sorry, I wasn't aware of the STL ban.