Split utility functions, fixing 06 a bit.