Fix indentation per #3121 comments