Clean up scope_to_records a bit more