No ticket: fix code style inconsistencies. Closes gh-1361