Fix broken unit specs
Improved if_p can chain #else_if_p,  #else methods