Syntax changes

Based on @miketheman's in-line comments.