remove typedef usage
(FIXME: revisit yes/no hacky implementation with c++11 features)