Remove unneeded package
Rename `*-p` variables.

While it is nice to immediately know whether a variable has a boolean
type, that style of naming doesn't look terribly good in the
customization interface.
Remove magic return values
Do the scoring TODOs
Clean up function