Minor code cleanup (still broken).