Major clean-up of meta.hpp