Clean up slightly.
Go generic, one place.
Go generic
Warning police.