Start (maybe finish) refactoring/simplifying padding handling.

This may or may not actually work, but hopefully it will, because it's
WAY simpler than the old way of doing things.