Remove ineficient boost asignments and convert statics into statics-on-demand (statics inside functions)