Minor code beautifications.