Nits, prepared for LMS conditional compile.