case changes related to marvin styling changes

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit aac88718dd0a04de0fbd25e930fe1f9edc0ed3f6)