Replace rowid shadowing fix with simpler solution; require that user specifies id column explicitly.