PDB-341 Use empty? and more :require/:use cleanups

Signed-off-by: Ken Barber <ken@bob.sh>