Move the type populating functions into their data type files...

E.g. unique blocks -> blocks.c/h