DE2300: Code review fixes.