More underscore niceness.
Fix type bug in findById.