boost::mpl: further map<> fixes

Signed-off-by: Alex Dubov <oakad@yahoo.com>