Move parent checks to onStatementAdded()