A bunch of default method fixes/improvements, and some other cleanups

r?