Addressed this in commit 090852ec008759eb1071486e08febcb8fed3ddca.