Further simplify Checker and de-inline members