Remove special handling. Agreed on context = tablename.